dateMenu: Force min-width of events area, not whole menu

The theme currently hard codes the minimum size of the calendar
menu to make sure there's a designated area for events
(even if there isn't anything currently scheduled).

A side-effect of the hard coded minimum width is that
if the events area is hidden, the menu ends up much
bigger than the calendar.  We don't currently ever hide
the events area, but we will in the future.

This commit moves the min-width restriction from the menu
specifically to the events area.

https://bugzilla.gnome.org/show_bug.cgi?id=657082

diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 8d112f1c3758fda939d4c4cb626a2a8509e27c8f..a2c832fff32a23320aa3fc0919d11e82a8ccda44 100644 (file)
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -836,9 +836,9 @@ StTooltip StLabel {
 
 /* Calendar popup */
 
-#calendarArea {
-    /* this is the width of the entire popup */
-    min-width: 600px;
+#calendarEventsArea {
+    /* this is the width of the second column of the popup */
+    min-width: 400px;
 }
 
 .calendar-vertical-separator {

diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js
index 4a4b103230c3c08bcab0505b12a39dea718ac680..1855c3a540d35b58489459c022df20620286205a 100644 (file)
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -61,7 +61,7 @@ DateMenuButton.prototype = {
         this._clock = new St.Label();
         this.actor.set_child(this._clock);
 
-        hbox = new St.BoxLayout({name: 'calendarArea'});
+        hbox = new St.BoxLayout({name: 'calendarArea' });
         this.menu.addActor(hbox);
 
         // Fill up the first column
@@ -101,8 +101,8 @@ DateMenuButton.prototype = {
         hbox.add(item);
 
         // Fill up the second column
-
-        vbox = new St.BoxLayout({vertical: true});
+        vbox = new St.BoxLayout({name: 'calendarEventsArea',
+                                 vertical: true});
         hbox.add(vbox, { expand: true });
 
         // Event list